commented and added property definitions