Made this code ready to be tested on 599A