Reverted to simpler base code, version broken