Dev

better to delete commented lines