Aligned functions and such added