added improvements