moved customizations to proper locations