this is cute but not commitable. fix please.