forgot to change variablenames
rework exceptions