Some development with added comments