Refactoring a bit :) also, again forgot about "then"...