removed all bugs