basic skeleton updated