added jan and stuff