Update from danielcrenna's repo