Preparing for multiple interfaces
Fixed rounding bug