Removed Logan's ugly ass code