FF issue fixed (offset created)
Refactoring Classes/Events