remove hardcode and fix save offering