Small modifications - not compiling atm