adding some extra features msjor update with ui update