resolved all bugs