Final changes for Satish Lab