check in development, gem rework