Started changes in Behaviour to allow memory