removed some distracting code