changed some initiation stuff