Rewrote code :(