Moved comments at the end