changed some code for testing purposes