Rename, instructions and bigger shapes