Making room for more code
Further work