started simplifying the code so it's not hardcoded