Changed everything a bit :p