added gems and general controller