modal working a little better