More work done

Signed-off-by: jurgen <jurgen@Jurgen-8510W>