With bugs - to fix