Signup and Buddie Model improved