updates for lukes code