configuration stuff added