ABC form improvements