small changes to logic and UI. Uploading for access @ class