Addded more behaviour