Changed code for testing