changing more featurs in the code. Will need to do a mjor cleanup to remove code noise