done staging existing logic