v0.0.2 Modified target location