Changed constructor to make it simpler, why not