updated with the new ampq project