Better states and added love-frames