Changed and removed a  couple of properties