I've updated the code to include what Badboii asked for. Let me know if anything got broken in the process or if it works okay for you.