Almost working as I wish