5pm version

more functionality added