Added/Modified functions to assist in the UI development