removed the old shit rate-limiting and added the optional stuff