updated with system option and functionalities