fixed some hard coding