Modified a few things