Try doing this better