More props final (I hope)