Modified it a bit