Small changes, faster :)