Fixed so it can now has some functionality