Fixed agility, removed @SuppressWarnings("unused")