removed log statements*