Removed some lines for testing