Modified a few things to include numpy