okay final changes for now