removed verbose code