blocklight fix and optimalization