Adding to creds + new idea for next version