Applied changes from bug testing