Added more functionality, playing with constants