added some redundancy to reintroduce delicious laziness