fixed initial setup