first today, looks more reasonable, will be used in master