changes to remove fuidity