removed bugged code