07/14 midnight changes

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