Got rid of absolute references