Added constants (will be removed later)
Removed ~ file