refactor code and add theater chase