#1 Updated with offset. Fixed some Sonar bugs