Add new solution
 #ANR-23 Fixed
 #ANR-24 Fixed