Added 5.0 and 8.0 for milestone 3