updated to commit #7f8a0a6