made alignment and updated efd code