Final changes before graphics work integrated