fw Alignment

Updated code to reflect changes made in the fw project.