added crappy modal
fixed merge conflicts