Modifications based on Wayne doc