Updated Top Up
Fixed Conflicts