Better way to do that plus some other things