Cleaning up and added another target for testing purposes