added improvements after testing