added initial setup