reverting some changes as they cause still cause error