Edited parts of q05