modified to work on mba
modified to work on mba