CR 001

Added more behaviour