Further devel

Have fun!
Good catch!