Make this more sain