First part of rastrack addition