Changed refferences too constants