Edited and completed q08