Reduced lag and added comments