Removed the ugly glob code