changes towards working gem