modal changed
changes from alex merged