modal updates. still buggy