fully functioning
merged