Removed a few lines too many