Revamped ugprade flow