Updated comments - appears to be working