redesigned/implemented
Signed-off-by: breadam <bilgi@breadam.com>