pushing some buggy code for uzair