1. adding Rap to the party
2. optimizations