This comment should probably be moved