sync with nik lutz repo