resolving problems #30