updated with latest ui work