updated because.. life sucks some times