- FIX: moved some parts of code into after-load macros