Updated to v0.1.7F