midnight changes 18th July

Signed-off-by: paramarco <paramarco@gmail.com>