Make it less sucky