J's first changes

Signed-off-by: Danielle Bakhazi <danielle.bakhazi@gmail.com>