Doing some more changes #ATEST-1