This is the best way now