edwin and colm made more modifications to make room and 'animate' functions