Added logs
Updated comments