Fixing the interface