(FIX) cleaned up method signitures.