fw Alignment

Updated the code to reflect changes made in the fw project.