removed the ugly stuff