Added RAP and Goodbye