Removed silly logic