Adding create pairs and fixing bugs with that