#7 Removed broken code