Danny - removed comments