Refactor to simplify
Added warra