Up to date from lan

Signed-off-by: Jacobengdahl <Jacobengdahl@gmail.com> and Fredrik Lönnstam