Reverted some changes made during debugging