CHANGE: added some key options for performance and alignment issues