Added this, pretty hard, but did by myself