local commit until main thread overload resolved
WORKING