Removed if statement for testing