Hopefully better way