updated to new software framework