Updates to code (old ones, actually, but here they are)