Updated working gem