added new bits, examples still broken