Some changes for viewing and stuff