DRY & fixed bug of only 2