Added partial proper behavior implementation."